commit after pull
merge conflict