Added the await operator
Fixed conflicts