Solving merge conflict..