adding new line for merging
fixing merge conflicts
adding last line
more more more lines
fix more more conlict
first line added in install file