Work on Merge code