merge conflict
make it work