resolve conflicts
add missing files
merged sunshine backend