Removed printlns.
Conflict fixed
conflicts fixed