flag positions
fixed merge conflict