node: Fixed more conflicts