"Quick" collision fix

Added special cases to remove butter cut collisions.
merge