Detection of a inexistent merge conflict

[DiogoM14]

Problem Whenever I make a change, the system detects a conflict. However, there is no actual conflict. Is not possible to change branch either. I have already attempted to remove the project, but it did not resolve the issue.

After encountering a merge conflict, I closed GitButler and resolved the issue using WebStorm. I then pushed the changes to the repository and returned to GitButler to fetch the updated version. It was when the bug happened

Solved with Go to the .git repo and delete conflicts and base_merge_parent files