Fixed errors resulting from last automerge