Merge error with FilterViewController