Merge fixed conflicts using Devin's copy.