committed unmerged changes, fixed now

My bad, I should have looked at what I was merging closer