fixed content provider position bug
fixed merge conflict and replaced all single quotes with double quotes