Fix merge related issues