resolved conflict in test_elements.py