Changed SOme things, need to commit so I can pull again.
getting old. How do i merge
got out of merge cycle