To avoid code conflicts in the first place, check in with your teammates as you each publish changes to the main branch in the remote repository. To keep your files up-to-date with everybody's changes, you'll need to switch to Advanced mode and do what's called a pull from the repository.