styling done and compiled successfully
fixing some errors that on merge
commit after complied