added all the things:
fixed merge conflict