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

Fixed admin conflict issue