work finished
conflict solved
finishing