Fix errors merging