Rebuilding after merge