merge conflicts + completed more speculation