Resolve errors while merging