DAR-875 | Special:CSS handling merge conflicts