framework progress
conflict solved