Fix merge issues and horrendous tabbing.