Fix auto merge