reviewed code
fixed merge conflicts