init app
fix merge