First line merge

I dunno what i am doing.