got rid of auto-generated merge code