2 divs
conflict resolved
new file