Changed order of annotation merge so as to not overwrite child annotations (issue #147)