create app
resolve conflict