fixed merge conflict
fixed merge conflict

LodoSoftware/chap-links-library,LodoSoftware/chap-links-library,hansmaulwurf23/chap-links-library,stefanofornari/chap-links-library,royquintanar/chap-links-library,hansmaulwurf23/chap-links-library,hansmaulwurf23/chap-links-library,royquintanar/chap-links-library,almende/chap-links-library,LodoSoftware/chap-links-library,ova2/chap-links-library,shelsonjava/chap-links-library,royquintanar/chap-links-library,hansmaulwurf23/chap-links-library,shelsonjava/chap-links-library,shelsonjava/chap-links-library,almende/chap-links-library,shelsonjava/chap-links-library,almende/chap-links-library,hansmaulwurf23/chap-links-library,almende/chap-links-library,stefanofornari/chap-links-library,royquintanar/chap-links-library,ova2/chap-links-library,almende/chap-links-library,stefanofornari/chap-links-library,ova2/chap-links-library,royquintanar/chap-links-library,stefanofornari/chap-links-library,almende/chap-links-library,stefanofornari/chap-links-library,stefanofornari/chap-links-library,shelsonjava/chap-links-library,LodoSoftware/chap-links-library,ova2/chap-links-library,shelsonjava/chap-links-library,LodoSoftware/chap-links-library,ova2/chap-links-library,ova2/chap-links-library,royquintanar/chap-links-library,hansmaulwurf23/chap-links-library,LodoSoftware/chap-links-library