git didn't tell I needed to merge...