removing files sure fixes merge conflicts, SourceTree.