thats a wrap on feature 1
added a new line ot index1
fixing merge conflict