design correction shitty merge