adding vims
fixing conflicts