Fix rebase errors
Assignment is reachable from deployment