replaced old merge with newer version that uses wrapper elements