rtc: Fix merging problem