mod helper
fix confilicts