Maven 2 & 3

implement conflict resolution techniques