hopefully autoloading is fixed now..
fix auto merge