home fixes
merge confl