most uptodate
resolved conflicts, removed old stuff