Reorganize never use merge commit code