Fixed found merge issues.