resolved conflicts from edwards commit