always install idea, diffmerge. Install comicbooklover+sync at home.