added header and colors to start
conflict fixed