All commands done
make done
try pushing
merge sth
merge conflict