Preferences in progress
conflicts solved
preferences is working