probably should learn how to better deal with merge conflicts