resolved conflict due to Bichar needlessly renaming an attribute