few mod
solving conflict