change for no-ff merge