Retry Image Downloads
fix conflicts