merge master and resolve conflicts