resolving app conflict