renewable plannings almost ready
fixed conflicts