fs: fix some merge derps

Change-Id: I75a599ab8a16351ab98feace3f300e69b8db7cbb