first comit
conflict fixed