Fixed merger issues.