re-ordered methods to try to get a clean merge