Fix app conflicts