Improved po integration
Resolved conflicts