A conflict means someone else has edited those files and made changes that conflict with changes you are making. You will need to resolve those using either your changes or theirs.  You can find that in the Changes pane.

The following link should give you more information.

https://docs.mendix.com/refguide/using-version-control-in-studio-pro/#conflicts

Good luck