Replaced queue_demo implementation with an object oriented implementation
Removed merge hints