removed git conflict code