Fixes untreated conflicts since last merge