Hi Mark,
You need to find out what is changed on the team server and how it differs from your change. When you know this, most of the time you can resolve the issue by selecting 'resolve using mine' or 'resolve using theirs'
See for more info: https://docs.mendix.com/refguide/version-control-concepts
And also this old post with explantation:https://forum.mendix.com/link/questions/2931
Go it! I needed to be in the "Project" level for tasks to be available. The answer was in that old post. Thank you!!