Fix Confilicts on image position change.
Merge pull request #18 from 4teamwork/mle-fix-confilicts

Fix Confilicts on image position change.