Wipe all references to nape.
a
Fixed merge comflics