corrected strange merge