works on Gifting. Removes merge conflicts