Few errors while merging resolved