Fixed comments in FilesystemManager.php
Remove useless else...return
merging and fixing conflicts.