stages almost finished
conflict resolved