# Conflicts: # app/src/main/java/com/tianrun/sipcall/call/InCallActivity.java # app/src/main/java/com/tianrun/sipcall/call/InCallMeetingActivity.java