Removed conflicts:
Removed conflicts  in ResourcePlayerMetadataView.java file
and gooru.css file
for Data log event new object added.
new Json object has been added for Question type resources.
conflicts has been removed.