merged $1 into $2 (revisions up to $3)