Changed img type
Reformatted
Fixed conflict