removed merge conflict
removed merge conflict

chriseidhof/JNWCollectionView,regexident/JNWCollectionView,kettch/JNWCollectionView,konstantinpavlikhin/JNWCollectionView,hachidorii/JNWCollectionView,Deadpikle/JNWCollectionView,danielmartinprieto/JNWCollectionView,jwilling/JNWCollectionView,Spark-Xl/JNWCollectionView