Some merges fixed