Add gitConflictResolver to unisuam environment