added comments
fix merge conflict