fixed some incorrect merged conflixts