test git push and conflict