fixed forgotten merge conflict indicator