move the alert spinner beneath the action form
resolve merge conflict