added back bad merge and axes
style