remove comments
fix merge conflicts?