fixes merge conflict (again)