fs/open: fix merge errors