Fix merge
Upgrade project for modbus work with display
or any other device