vimrc
aliases
merged
update .alias
fix conflictions