add admin
resolve conflicts