start gearmand if it's not running already
merge conflicting Makefile