merge conflict plus colour for real