requires conflict solution and git conflict merge fix