commit 2 ls.txt
merge deve
deve1 merge master
deve1 pull