remove conflict in app