Pull latest changes and resolve merge conflicts