category tree fix
conflicts