#pragma added to find button
Conflict resolved