Admin part
resolve conflicts