Craete application.
Resolve conflicts.