custom formulae done
Formulae Done
Conflict resolved