remove fuzzily
fix all merge conflicts