Write user manual for the app (missing images)
Fix merge conflict