Handle merge failure