fix merge conflicts, remove puts garbage