merge background and master