GUI - Filter Creation : Merge Fix

Fixing merge conflict