[Feature]: Provide a way to resolve the merge conflicts when we pull the branch from remote

### Is there an existing issue for this?

- [X] I have searched the existing issues

### Summary

Now that we are in the phase of implementing the git-import flow users can use different instances to work with apps and can work collaboratively. In such a setup if multiple folks work on the same branch and update the same resources, which will end up in conflicts. Today there is no intuitive way to handle this scenario.
Consider a scenario multiple users is working on the `F1` branch, and update the same resources from 2 different instances `In1` and `In2`. Now whoever commits later will face the issue of a merge conflict.
Today this can be handled in the following way:
- Create a new branch in appsmith from the conflicted branch e.g. `F1_conflicted`
- Resolve the conflicts on remote (Between `origin/F1` and `origin/F1_conflicted`)
- Merge this new branch into old branch (`origin/F1` <- `origin/F1_conflicted`)
- Pull the branch again (`F1`)
- Delete branch `origin/F1_conflicted`

This flow works but some parts can be automated like creating a conflicted branch and pushing it to remote (`F1_conflicted`). We can definitely improve on UX flows here.

### Why should this be worked on?

This will be necessary as with git-import flow this will be required if we want to give users true collaborative experience like Git.