fix merge conflict package json files frontend

Signed-off-by: Mohammed Abdi <moabdi@Mohammeds-MBP.attlocal.net>

Author: Mohammed Abdi