Yes! You would have merge conflicts. You have two options:

1. Tell the reviewer that you will address his comment in a follow up PR which modifies exactly this code

2. Resolve the merge conflicts. Since it is your own code you should be fast in resolving those conflicts.

Most of the times I go for 1.