fixed registration
resolved conflicts