Login or sign up Lost password?
Login or sign up
The repository is on these lines to start the external merge tool to resolve the conflicts.