errors are gone from merge, and templates and directives bindings fixed for marker ,markers, window, and windows