Improve the conflict resolution

You should check with @adam1991 with the topic Setting recording priority?

He really has this covered… :neutral_face: