Fix ending salary display name
fix merge conflict