Commiting userprefs so i can pull
Resolving a conflict