Merge errors fix. Sorta