git failed the properly merge??