Complete serve app ready.
Resolved conflicts.