Added Footprint
Conflict fixed