Remedy merge conflicts, between front end and back end updates

[pwarias]

Recent updates to the two domains of our application may have some conflicts therefore as developers we need to remedy them in order for the stack to interoperate with all its components.