fix mergeerrors