cleaned up some conflicts with git.