add in new master dev
add fail lster
master test
conflickt fix
dev add
merge with --no-f
fix issus 101
fix issus
fix master bug
fix all now
feature fix now so commit
feature1 fucntion comple