Add Bellman constraints model
Fix merge conflicts