docs(javadocs): fixed an unresolved conflict that was hidden in the Javadocs.
docs(javadocs): fixed an unresolved conflict that was hidden in the Javadocs.

ISSUES CLOSED: #49

Syncleus/aparapi,Syncleus/aparapi,Syncleus/aparapi,Syncleus/aparapi