cleanup and conflict solved