Less printing
Resolved conflicts