Updated podpsec - removed conflicts