Fix vigor adds/removes
add p920
remove ugly merge lines