Fixing merge vestige