Fix merge conf