resolve merge conflict
resolve merge conflict

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