fix merge errors is fs_mgr

Change-Id: Icb6f548b18053c1c871d7cf11beb871bfa681958
Signed-off-by: Arnav Gupta <championswimmer@aokp.co>