fixed left over merge stuff