Roku Developer Program

[namlu]

I'm currently using Sublime text editor with a Brightscript plugin to code with. When it comes to resolve merge conflicts, is there a free tool to use to more easily resolve conflicts?

If not, is there another IDE I could that would have such a tool?

[namlu]

I've just tried the following:
https://github.com/DougTy/sublime-compare-side-by-side

and 

https://github.com/colinta/SublimeFileDiffs

Not very clear how they work as they seem to open the diffs in a seperate tab.