Commented out check for clashes implementation
merge