Cleaned up messy auto merge