some change after merged