HOME: Added conflict file