Removed conflict detection. it is not needed and it makes binary versions fail