styling

bad merge fix