events controller conflict, commit after fed fixed, take 2