Fixed weird merge artifacts.