fix conflicts #1