fixed some strange spacing that occured after merge