Adding upstream master and merging