Fix unmerged changes