Updated merge code in forge.