Merge diff to master