initialize app
fix merge conflict