Adam,

 

The latest build has resolved my merge conflict and everything seems to be in order.  Thank you! 

 

Would you be able to tell me what files were changed in this latest build?  I'm asking because I need to determine if I need to update the .dlls as well as the \CuteEditor_files folder for my next build.  I'm hoping you can save me some time if I only need to update a couple files such as the Load.ashx file under Dialogs.

 

Thanks