resolve conflict with merge