Resolve conflicts from master branch