Merging branches to master