Try
Unfinished development
.classpath
conflict resolved
Claire's WedNet Added