removed git conflict shit