fixing parse_callback no callback behaviour
fixing merge conflicts