init repo
resolve conflict