add codes after conflicts