Properly resolve merge conflict.