merging two versions of project HH-Kitas