additional modifications made to get merged work to function properly