landing page
application layout merged,  conflicts fixed