now using gradle build framework
merging