Merging in personal stuff