git merget mistake fix