Fixing merging issues