Initialize repository
merge conflict