initialize repo
resolved conflicts