corrected remaining overwrites/conflicts