Changed back the local modifications
Merge origin/master
Changed the fields. Should change that in db too