Modify image position
Resolve conflict
Resolve conflict again