my changes DON'T MERGE