resolved conflicts from testing 1.0