init repo
conflic solve