merge error corrected (retrieving filterConditions was broken)