Ignore the xccheckout file
Use CHTCollectionViewWaterfallLayout fork until push request is merged