add line to APIResource.java.  1st edit after normalize# Please enter the commit message for your changes. Lines starting
remove line from APIResource.java.  2nd edit after normalization.
added one line to AdminResource.java.  3rd edit after normalization.
Did something magical to AdminResource.java
WTF?
Merging local conflicts
Last bit of merging.