Nikhil's merge