fixes
- fix merge
- add prints
- fix compilation
- fix dhcp parser