resolve more conflicts