Review

Hopefully all the conflicts are fixed now.