conflict came when importing software component version fromXI DEV to QA

Hi Sapall.

i just made a small change in xi development to message mapping program and then i exported the software component version from XI DEV ,after this basis has coiped the file from xidev Export Directory to XI QA Import directory ,but when i imported the SWC into XI QA it says conflict lists were created during the subsequent integration and must be resolved manually .

when i had a look in message mapping under objects is is still same as before which was in xi dev and it also saying as

Active Version An import has caused a version conflict You have chosen the active version.

waiting for appropriate answer.

regards.

varma