fixed wrongly solved conflict