fixed merge error
added foreman