Merge is working