Fixed app conflicts