Add flash msg
Resolve conflict