merging complete

Merge is now done