edited merging