Resolved git conflict