Gave fiducial pattern locations
Merge conflict