Resolve conflicts with master