making conflict
createing conflictg master
fixing conflict