Try catch
Merge remote-tracking branch 'master/master'

Conflicts:
	protected/runtime/application.log