Properly resolve conflict