Fix a few forgotten conflicts.
Fix a few forgotten conflicts.

antek-drzewiecki/passenger,openSUSE/passenger,kewaunited/passenger,openSUSE/passenger,fabiokung/passenger-debian,kewaunited/passenger,clemensg/passenger,clemensg/passenger,bf4/passenger,jawj/passenger,openSUSE/passenger,phusion/passenger,jawj/passenger,gravitystorm/passenger,clemensg/passenger,clemensg/passenger,jawj/passenger,gravitystorm/passenger,pkmiec/passenger,cgvarela/passenger,fabiokung/passenger-debian,bf4/passenger,kewaunited/passenger,bf4/passenger,gravitystorm/passenger,antek-drzewiecki/passenger,erikogan/passenger,kewaunited/passenger,erikogan/passenger,cgvarela/passenger,fabiokung/passenger-debian,openSUSE/passenger,jawj/passenger,antek-drzewiecki/passenger,erikogan/passenger,cgvarela/passenger,cgvarela/passenger,pkmiec/passenger,cgvarela/passenger,bf4/passenger,bf4/passenger,phusion/passenger,gravitystorm/passenger,cgvarela/passenger,fabiokung/passenger-debian,phusion/passenger,jawj/passenger,clemensg/passenger,fabiokung/passenger-debian,erikogan/passenger,pkmiec/passenger,cgvarela/passenger,gravitystorm/passenger,phusion/passenger,pkmiec/passenger,phusion/passenger,phusion/passenger,jawj/passenger,kewaunited/passenger,pkmiec/passenger,gravitystorm/passenger,phusion/passenger,openSUSE/passenger,antek-drzewiecki/passenger,phusion/passenger,openSUSE/passenger,antek-drzewiecki/passenger,kewaunited/passenger,fabiokung/passenger-debian,clemensg/passenger,bf4/passenger,kewaunited/passenger,pkmiec/passenger,antek-drzewiecki/passenger,kewaunited/passenger,clemensg/passenger,antek-drzewiecki/passenger,bf4/passenger,cgvarela/passenger,clemensg/passenger,pkmiec/passenger,jawj/passenger,antek-drzewiecki/passenger,erikogan/passenger,erikogan/passenger