oops left conflict text. fixed