working https functionality
resolve conflict