AWFUL MERGE THAT TOOK FOREVER