A smart tool to provide diff/merge resolution for Java files - View it on GitHub