Fixes collision
Commenting out conflicting lines