Simple test had some conflicts that triggered errors. Also replaced call to update with merge.