Merge with other project code