data and changes
conflicts merged