Add more fields
conflict solved