if(trackingNum != null){ } What is the best project structure and merge flow for TFS?