Added accept merge option to p4-switch-context