Resolved Conflict

Added Oscillation and Patterns