Mergest master into css