git didn't merge correctly..