Resolve conflicts in sourcetree for mac