fixes bad commit with merge tags