Properly fix merge conflict. Previous workaround isn't applicable anymore.
Properly fix merge conflict. Previous workaround isn't applicable anymore.

FROGGS/parrot,FROGGS/parrot,tkob/parrot,youprofit/parrot,tewk/parrot-select,tkob/parrot,tkob/parrot,gagern/parrot,tewk/parrot-select,parrot/parrot,youprofit/parrot,gagern/parrot,gitster/parrot,gitster/parrot,youprofit/parrot,gitster/parrot,gitster/parrot,parrot/parrot,tewk/parrot-select,youprofit/parrot,gagern/parrot,tewk/parrot-select,gagern/parrot,gitster/parrot,parrot/parrot,gagern/parrot,tewk/parrot-select,tkob/parrot,tewk/parrot-select,FROGGS/parrot,parrot/parrot,gagern/parrot,tkob/parrot,parrot/parrot,gagern/parrot,FROGGS/parrot,tewk/parrot-select,tkob/parrot,youprofit/parrot,FROGGS/parrot,FROGGS/parrot,gitster/parrot,tkob/parrot,youprofit/parrot,youprofit/parrot,youprofit/parrot,gitster/parrot,FROGGS/parrot,FROGGS/parrot,tkob/parrot