remove content of file
added content
merge of my conflict
removed test file