second commit to develop
added file with conflicts