doing stupid WIP2
Resolve confilct