Add collision resolution