revert pso merge because of conflicts