Merge changes back to original class