Added ulimit definition
Added ulimit definition and fixed conflict