Final fix on merge

awk.