Fixing merging issues...