Fix merge resolve thing