virtual merge into master