new styling
merge failures fixed