Fixxed merge in xml and in broadcast recievers