Needed to manage merge conflict

Test had extra line of text added outside of git and no git add test had been done.
so got merge conflict. looked at: http://stackoverflow.com/questions/161813/how-do-i-fix-merge-conflicts-in-git
to try a fix. Then got a bunch of test.local.12345 -ish files.

Bad merging is like a bad marriage.