merge changes to p2