delete michael
fix conflicts