remove merge files + alt mappings
add marvim alias