fixed some old merge conflict i missed