Pulls data from models
resolve merge conflicts