Git Accept Both Changes