removed conflict mark, small code rewrite