Merge works even conflict exists. ref #221