Couple of tweaks to my compositions that I hadn't committed before.
Resolved pull conflict by deleting local class files and accepting changes to Main.java