changing async to false
Fix conflicts.