Removed git conflict stuff