refactor replay controller
refactor replay controller conflict resolve