merge then push