Merge conflict with remote. Enable filtering by multiple params from sandbox