trying to get auto-merge to work properly