files were removed after conflict merge due to case insensitive filesystem on mac