Fixed the Merge Error... but still broken