edit in local vim
fucking conflict