Solving merge conflict.