conflicts resolved

The IPBus addresses has been updated. Also the functions to read the data were modified. And finally as requested the conflicts are resolved!