I have successfully imported patches without having conflicting changes. But when I try to import patch with conflicting changes it throws an error saying \"Hunk #1 FAILED at 11