Fix merge errors
Work on registration screen backend