Update vitae.
Fix merge conflict.