app creation
conflic resolution