fix up fstab after merge