home fstab
firefox changes
merge conflict