added sleep wrapper
resolved conflicts