Committing before attempting to merge User and UserConfig