Content Provider Added
Conflicts fixed