style(whitespace): tabs to spaces
fix(merge): Fix merge problems and start FacilityService