Modified atom and vim
Merged conflit