fix merge historycontroller