Remove unnecessary files, Resolve conflicts