flags working
fixed merge errors