Add prompt to cleanup if merge fails