Clean up derelict merge conflict in article partial