merge left some garbage lines.. cleaned up