More clean-up and conflict resolving