sure... try this
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
My God, JS... format dates like normal languages.