Try switching to master first
Merge branch 'master' of github.com:jasonkliu/RailsMailer

Conflicts:
	shippable.yml