git init
solved confilcts