fixed pom and mule-project after merge