Fix unfinished merge