just added comments
fixed merge conflict