Fixing conflicts after merge