resolving conflicts in dice file