OMFGMerge Conflicts in .png... should be sqare now...