removed merge conflict indicator