commented out merging style conflicts