fixed problem with empty path
update merge conflicts and coding standard