Thread:TheAquuaHybrid/@comment-26249031-20150807055240/@comment-25393934-20150807061743

I took care of it, the conflict is resolved. you can close this if you'd like.