resolve merge conflict
resolve merge conflict

walterbender/musicblocks,hemantkasat/musicblocks,Hrishi1999/musicblocks,Kachachan/musicblocks,Hrishi1999/musicblocks,khandelwalYash/musicblocks-1,khandelwalYash/musicblocks-1,Kachachan/musicblocks,khandelwalYash/musicblocks-1,tradzik/musicblocks,hemantkasat/musicblocks,Hrishi1999/musicblocks,eohomegrownapps/musicblocks,walterbender/musicblocks,sneh1234/musicblocks,hemantkasat/musicblocks,eohomegrownapps/musicblocks,sachi-d/musicblocks,pikurasa/musicblocks,walterbender/musicblocks,pikurasa/musicblocks,eohomegrownapps/musicblocks,sneh1234/musicblocks,Kachachan/musicblocks,tradzik/musicblocks,sachi-d/musicblocks,sneh1234/musicblocks,tradzik/musicblocks,sachi-d/musicblocks,pikurasa/musicblocks