Merge codina and u8500-common