Upgraded to FunctionalJava 4.1
Resolved conflict