Files: add .slugignore
mergeconflict fix