manually merge from detached head