fix for auto merge