Fixed conflicts with self

Project no longer broken.