working under flask
fixed index merge conflict