fixed another conflict resolver screwup