Fixed the wonky merging
Colors!