Pr/68

Fixed conflicts