removed printlines
conflicts fixed
uh