Draft outline for today
Resolving merge conflict