No he didn't he died LONG before then, he was dead when Obito attacked the village which was YEARS before the Massacre -_-
ah man ... i see that you don't read the manga and also i see that you don't know logic :/ , and don't know the meaning of a genjutsu , and i believe that you don't believed in itachi when he told to sasuke that the one who helped him was indeed uchiha madara , do you know the meaning of the world "WILL" in naruto universe? and you know what are the powers of the white zetsu alone? if you do , then joint 1+1 and that result is 2 , meaning that we have 2 MADARAS that are "walking" in the earth , really , think please

, i can explain you , but with some videos , and if you don't believe me , then it's not my fault , also , obito didn't had any reason to kill the uchiha clan , but uchiha madara was indeed the one who had a reason to do it , and the one who did it in reality was uchiha madara , uchiha madara is the master of the youton no jutsu (or how is it spelled) but whatever , you'll see that , when madara reveals his trump card .
The Edo-Madara is only a soul , we never saw the edo-madara mentioned him as "MADARA" , but indeed we only saw that in
TOBI , Obito never mentioned him as Obito , but indeed as madara , obito is just a vessel , kabuto didn't lie and wasn't mistaken when he said to tobi that he was only a vessel, tobi laughed at kabuto when he showed him the edo-madara because he didn't knew that edo-madara could break from the edo-tensei , if you think that madara failed in all , you're dead wrong , uchiha madara is the true definition of immortal , now figure out the rest

.