fixing incorrect merge conflict