Attempt to allow a clean merge...