refixed merge conflicts