it works
fixed merge conflicts