There's probably more to this problem than I am seeing in your post: Your reference to the 'conflict triangles' on the component functions looks to be one of the root causes of problem. Each component function with a triangle is in conflict between 'MyDatabase' and the XCF project. Basically PEP2 is saying: "which IR code do you want to use for this function: your project IR code differs from what is stored for the same device in MyDatabase".

If you click on the traingle on each conflict function, you should get a window that allows you to update MyDatabase from the project or the other way around; depending on which version of the code is the correct one.

Once you have resolved all of the conflicts, try uploading the fixed version to your TSU: If it is just a project vs. database code conflict you should be green to go.