Fixed admin conflict issue
Merge pull request #142 from RTakes/conflictRes

Fixed admin conflict issue