fixed garbage from forced merge