changed pom for platform independent
Resolved Conflict