Fix a stupid bug with merge
Fixing and merging ooooone more time