Merging changes with ParallelJ code validation project