added text to index [changy\]
 adding text in changy branch again
adding text in index master b
fixing merge issues
fixing merge extras
new fix changes here
fixed subtick merge
Merge branch 'newfix'