fix activity modle after conflict.