add merge and patch