Added MergeClass java file, minor changes to Commit and SCC files