fixed variable
fixed merge conflicts