Cleaned up conflicted files, added predictor diagram