[Android Builders Collective] Mikulec:
Here are the 2 files mentioned in the first error, I have done no changes to them. In the slim_strings.xml I see this conflict at the end:

<<<<<<< HEAD
<!-- Lockscreen Notifications -->
<string name="lockscreen_notifications">Lockscreen notifications</string>
<string name="lockscreen_notifications_summary">Show pending notifications on lockscreen</string>
<string name="pocket_mode">Pocket mode</string>
<string name="pocket_mode_modes_alwayson">Always On</string>
<string name="pocket_mode_modes_alwayson_summary">Your screen is turned on to show all notifications when device is pulled out of pocket, and is turned off if it gets back into pocket.</string>
<string name="pocket_mode_modes_unreadnotificationsonly">Unread notifications only</string>
<string name="pocket_mode_modes_unreadnotificationsonly_summary">Your screen is turned on when device is pulled out of pocket with unread notifications, and is turned off if it gets back into pocket.</string>
<string name="pocket_mode_modes_disabled">Disabled</string>
<string name="wake_on_notification">Wake on notification</string>
<string name="wake_on_notification_summary">Wake device when a new notification is received</string>
<string name="notifications_height">Notification count</string>
<string name="notifications_height_summary">Number of notifications displayed at once</string>
<string name="lockscreen_notifications_color">Notification background color</string>
<string name="lockscreen_notifications_color_summary">Color of the lockscreen notifications</string>
<string name="lockscreen_notifications_type">Notification types to display</string>
<string name="lockscreen_notification_types_nonclearable">Non clearable</string>
<string name="lockscreen_notification_types_lowpriority">Low Priority</string>
<string name="lockscreen_notifications_excluded_apps_title">Excluded Applications</string>
<string name="lockscreen_notifications_excluded_apps_summary">Excluded applications will not show notifications on lockscreen</string>
<string name="privacy_mode">Privacy mode</string>
<string name="privacy_mode_summary">Disables notifications from being shown and dismissed. This way, you just see the icons of your notifications.</string>
=======
<!-- Lockscreen Wallpaper -->
<string name="lockscreen_wallpaper">Lockscreen Wallpaper</string>
<string name="lockscreen_wallpaper_disabled">See through needs to be disabled</string>
>>>>>>> 3b4d92e... Lockscreen Wallpaper [1/2]

Here is the error of the second commit - Lockscreen wallpaper 2/2:

jofo@jofo-desktop:~/slim/frameworks/base$ git status
HEAD detached from 476a1e0
You are currently cherry-picking commit 0f465a0.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

modified: core/java/android/provider/Settings.java
modified: core/java/com/android/internal/policy/IKeyguardService.aidl
modified: packages/Keyguard/src/com/android/keyguard/KeyguardService.java
modified: packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
modified: packages/WallpaperCropper/AndroidManifest.xml
new file: packages/WallpaperCropper/res/drawable-hdpi/ic_lockscreen_reset.png
new file: packages/WallpaperCropper/res/drawable-mdpi/ic_lockscreen_reset.png
new file: packages/WallpaperCropper/res/drawable-xhdpi/ic_lockscreen_reset.png
new file: packages/WallpaperCropper/res/layout/actionbar_set_lockscreen.xml
new file: packages/WallpaperCropper/res/layout/blur_dialog.xml
new file: packages/WallpaperCropper/res/layout/lockscreen_main.xml
new file: packages/WallpaperCropper/res/values/custom_strings.xml
new file: packages/WallpaperCropper/src/com/android/wallpapercropper/LockscreenWallpaper.java
modified: policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java
modified: services/java/com/android/server/power/DisplayPowerController.java
modified: services/java/com/android/server/wm/WindowAnimator.java

Unmerged paths:
(use "git add <file>..." to mark resolution)

both modified: packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java

And the file is in the attachment.