working on def merge

trying to get def merge right