made merging work