add comentaries
fix merge