Initialize repository
resolve merge conflicts