merging intern code