commit before pull
fixed merge conflicts. added log to enable push notification for FP users