merge
fixes
[auto] problems compiled
[auto] problems compiled