Removed merging error