VESPERS: Fixed a merge conflict.