more git commands
fix ordering of local path imports