update the .org file
merge