improve merge commit design