image/rootfs directory added (emtpty)
Fixed merge conflicts
Minor changes