merge conflicts corrected