fixing more merge goofs