simplify MergeMessageParser
add concept of short version
fix merge message parser

fixes #259