deleted some conflict issues