Conflicts conflicts conflicts
Corrected typo in unmerged vaR