Cleaned up ugly merging