Solving git conflict
Resolved git conflict