Merging with Local version

First timer....ugh