lightirc: Fix merge conflict