Update Entity to match wanted sql db
Merge 'origin/master'