Got rid of weird formatting things from merge