Merge master and solve conflict