Removed git conflicts