Merge conflicts #4