Fix merge issues. Code style fixes.