Fixes #237, binary files were always in conflict, even for same files
Code style
Code style