fixed : registrations bug
fixed : conflicts