mod helper and keyclientorder
fix conflicts