confliction commit test