Admin: merge conflicts