solved git conflict