merging
fixed merge conflicts
check