Changed update script to pull new version, force pull to ignore conflicts