initialize git
merge conflict