Post-pull merge. Fixed master's merge errors in cynet app.