CodeMerge-3/3-2