init app
merge fix