Cleaned merge oopsies