Cleaned up file manager
fixed conflicts