Fixed Merge (?) and Editor Settings