solved more conflicts