From your comment I see you have not gone through the "fun" of merging 3+ projects with varying degree of changes.