Fixed indentation
Add conflictCheck and async helpers