resolve cconflicts
upload some images