remove merge confliction.