Added Flags
Resolved Conflicts