[#43507091] Fixed merge conflicts

Fixed merge conflicts to try to get the site back in a good state.