Merge conflicts corrected