Fixed weird merge issues.