First steps in merge with backend