Fixing a merge bug