Added files into clones file
Fixed Merge conflicts