fixed bothced merge