added lines to the index to review conflicts