Stupid thing about CN Client
Conflicts!