Merge double collision fix