vim wrapper to handle git conflicts