added file explorer
removed and changed conflicts