resolved git conflict