MAP-687: Final formatting to Not-A-Conflict functionality
Fixed webapp pom issue