basic usage for git push confict