commit work
fixed merge conflicts