Fixing missed merges