misc.xml fixed after merge