Added email generator , fixed merge git command