Fix typo
before_save callback for merge
update docs