new fiel 3.txt
master update
commit new feature1
manerger work is done now
check in stash_demo2
merged f1
just update to crate merge confilict
updage for confilict
confilct please
meger 1.txt from old branch
add new file
updat3e 3.txt
just update to crate merge confilict
just update to crate merge confilict