manual fix merge confliction