Fixed merge conflict and database calls working