Fix merging Error