[PLib Test App] Fix merge conflicts on project files