merge error. fix: private methods blocked callbacks