WIP-wheezy fix hammer file conflict