warning: Cannot merge binary files: res/drawable-xhdpi/ic_settings_cmlauncher.png (HEAD vs. testing)

Auto-merging res/drawable-xhdpi/ic_settings_cmlauncher.png
CONFLICT (add/add): Merge conflict in res/drawable-xhdpi/ic_settings_cmlauncher.png
Auto-merging res/values/strings.xml
CONFLICT (content): Merge conflict in res/values/strings.xml
Auto-merging res/xml/settings_headers.xml
CONFLICT (content): Merge conflict in res/xml/settings_headers.xml
Auto-merging src/com/android/settings/Settings.java
CONFLICT (content): Merge conflict in src/com/android/settings/Settings.java
Automatic merge failed; fix conflicts and then commit the result.