add flags to context sentence
fix merge conflicts