fixed minor merge conflict bug