what i mean is here u left the conflict syntax github added there