fixed major issue with printing.
fixed confilict
completing merge