need to add .keep extention deletion
fixed merge conflicts