Resolve conflicts w/ origin/master