adding frontedn work
Fixing merge conflicts