Fix Error in merge