Would you get the merge conflict if you mark the *.png extension as 'binary' in .gitattributes?