added '(pink)' to message stating how nonresolved conflicts are handled