test test_howeard add a line second line add ad third line commit 2 add fourth line add 5th line add 6th line second time add 7th line add new lin in dev <<<<<<< HEAD add 2th in master add 2th in dev dev add 3th in dev add 3th in dev