Update to master and resolve conflicts