Confliction solved

Confliction solved