fs: Fix merge conflicts

Signed-off-by: Zhao Wei Liew <zhaoweiliew@gmail.com>