Deploupling IRC command parser
Fix conflict