madrid
add MAD to pt
solving conflicts