Returns filing for trust

Hello

I am trying to file an Income Tax Return of a Trust. However, the PAN No. of the trust contains "A" as the Fourth Letter, which denotes that the assessee is an AOP. Thus, while calculating the Income of trust, the calculation is done as per AOP and not as per trust.

How can i overcome this?

Can  i change the PAN from AOP to Trust?

Any other solution for the same?

Thanks in advance.