Fixed merge conflicts and additional directories