fix imageutil
fix conflicts