salary module completed
merge resolved