removed git conflict message