Resolved merge conflict with gdp-ui pom