Stop squashing but no argument and enforce checkout from development and fix development parent wrong