Background added
conflicts fixed