fixed get_output merge conflict