fixed Images.java mergeissue