removed git conflicts