Resolve conflicts

Resolve conflicts in registry