Initing git repo
Fixed conflict