Fixing merge issues with github init vs. local git init