WIP broke the statem, fixed one merge bug, still hunting others
Remove tmp files