fix for unnecessary merge