fixed registration merge errors