Fix merge conflict
create editor file
Remove hidden files from ll