Issues with merging resolved