Merge with new gradle project complete