Register complaint changes
conflict fixed