included static list on client screen | chanakya\chethan
Added static list to client side
fixed the merge conflict