fix merge conflicts
remove debug statement