Revert "merge background and master"