Fixing unmerged changes...