Update SalaryHistory & Inbox & Attendance
Update conflict