fix conflicts
fix imageEntry check to work with "ReplaceSources"