minor review
fix merge-conflicts