Fixing master after merge"