finalizing merge conflicts
fixed merge