Pret a etre merger

yeah