cleanup shitty merge...