modified public headers -> project
working
resolved merge conflict