fix formatting due to merge