merge parent into fork