Add afterTomorrow docs
Resolve conflict