Deleted main.java.conflict - it wasnt doing anything