Fixed merge related issues.