better collision resolve