ServiceBuilder was run to fix conflicts introduced by merge