removed some conflict text