Add button changes its function based on which view controller is being presented
fixed merge conflicts