edid i.txt on master
edit i.txt on develop
resolving the merge conflict