merge changes from gradle-template project