Fix merge conflict, inter-example spec dependencies