Reordering Code after merge