[US205] Fix bad merge