fix ugly formatting after merge