fix Louis bug
fix conflicts