add more effect on validation
fix peerpen.iml conflicts