Removed merge markers from bokeh/properties.py file

Hi,

I removed merge marker from the properties.py module otherwise library won't work.I hope this is ok!