Bugfixes

- Corrected the TMan merge function
- Changed scenario
- Added timestamp to PeerDescriptor for comparison