fixed bad commit with merge tags