FIXED: Results of bad merge