Merge pull request #791 from mfournier/fix-lvm-merge-conflict-mistake