stub
added vimrc file
resolve conflicts