MERGE BRANCH: split models & filters