Adding planned contents
Resolving merge