Fixing mistakes I made in merge