idk how to merge conflcit kill me