fix merge conflict left in code

remove merge relic left in @ctailor2 merge