collision fix
merge and fix