merge repo has case sensitive conflicts in its index, add tests to handle
such