Fixed merge errors and add icon image and directives folder