Fix formatting, formatting conflict