Removed git conflict