fix conflicts take 2