removed diff marks