initial updates
initial updates conflicts