Added data for testing
Fixed merge conflicts