Merging master with deployment