update to auto merge