Fixing merge attendance