copy over a fix for lou tweak
sync merc5 (various changes)