Fixing lergarlins merge