Fix manual conflict assignment bug (Nickolai report).