commit
merge after pull