befor marge
mastr before marge
fixed the conflicts