added a print
merge conflict resolved, other stuff apparently