FIX: forgotten merge conflict comment