All conflicts are resolved, application can be run at now. But still enough..