Hopefully fixed conflict issues