Resolving conflicts with patch