merge: extract prepare_merge_message() logic out