[formatting] run formatting again - partially reverted due to automatic merge