took out a useless line
fixed merge issues