Fix merge troubles