fixed mege conflicts