#619 merge conflicts