trying a new local git repo
fixed merge conflicts