merge after check out