Implemented video call
Implemented video call
Fixed conflicts